Fix some compiler warnings. (#433642, Kjartan Maraas)

2007-04-30  Matthias Clasen  <mclasen@redhat.com>

        Fix some compiler warnings.  (#433642, Kjartan Maraas)

        * gtk/gtkfilesystemwin32.c (gtk_file_system_win32_get_info):
        (gtk_file_system_win32_create_folder):
        * gtk/gtkaction.c (gtk_action_create_menu): Fix NULL/FALSE confusion.

        * gtk/gtklinkbutton.c (gtk_link_button_clicked): Pass
        the right type to uri_func.

        * gtk/gtktext.c (gtk_text_key_press):
        * gtk/gtkstatusicon.c (gtk_status_icon_get_property):
        * gtk/gtkxembed.c (_gtk_xembed_send_message): Add casts.

        * gtk/gtktrayicon-x11.c (gtk_tray_icon_manager_window_destroyed):
        (gtk_tray_icon_delete):
        * gtk/gtkprintunixdialog.c (create_main_page):
        * gtk/gtkhsv.c (gtk_hsv_motion): Remove unused variables.

        * gtk/gtkliststore.c: Adapt callbacks to GSequence types.

svn path=/trunk/; revision=17739

diff --git a/ChangeLog b/ChangeLog
index 67e5ab1d59e3f40f843cbe9945519e49508ccfec..928169fb62a19f8ba5fa7ce985c732183141c322 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2007-04-30  Matthias Clasen  <mclasen@redhat.com>
+
+       Fix some compiler warnings.  (#433642, Kjartan Maraas)
+
+       * gtk/gtkfilesystemwin32.c (gtk_file_system_win32_get_info):
+       (gtk_file_system_win32_create_folder):
+       * gtk/gtkaction.c (gtk_action_create_menu): Fix NULL/FALSE confusion.  
+
+       * gtk/gtklinkbutton.c (gtk_link_button_clicked): Pass
+       the right type to uri_func.  
+       
+       * gtk/gtktext.c (gtk_text_key_press):
+       * gtk/gtkstatusicon.c (gtk_status_icon_get_property): 
+       * gtk/gtkxembed.c (_gtk_xembed_send_message): Add casts.
+
+       * gtk/gtktrayicon-x11.c (gtk_tray_icon_manager_window_destroyed): 
+       (gtk_tray_icon_delete):
+       * gtk/gtkprintunixdialog.c (create_main_page):
+       * gtk/gtkhsv.c (gtk_hsv_motion): Remove unused variables.
+
+       * gtk/gtkliststore.c: Adapt callbacks to GSequence types.
+
 2007-04-30  Cody Russell  <bratsche@gnome.org>
 
        * gdk/win32/gdkwindow-win32.c: Reintroduced erase_background(),

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 899de0faf89066d967b285cd296f66ee83823e8b..a0066911587d19b1868802c62f5fade1d5a6cb59 100644 (file)
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -1791,7 +1791,7 @@ gtk_action_disconnect_accelerator (GtkAction *action)
 GtkWidget *
 gtk_action_create_menu (GtkAction *action)
 {
-  g_return_val_if_fail (GTK_IS_ACTION (action), FALSE);
+  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
 
   if (GTK_ACTION_GET_CLASS (action)->create_menu)
     return GTK_ACTION_GET_CLASS (action)->create_menu (action);

diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c
index f8fce08f69336abec70219b86d1172d96b99c7e1..31547b042aabed9c6c45b1c45138f14bfa3c35cb 100644 (file)
--- a/gtk/gtkfilesystemwin32.c
+++ b/gtk/gtkfilesystemwin32.c
@@ -973,8 +973,8 @@ gtk_file_system_win32_get_info (GtkFileSystem               *file_system,
   handle = create_handle (file_system);
 
   filename = gtk_file_path_get_string (path);
-  g_return_val_if_fail (filename != NULL, FALSE);
-  g_return_val_if_fail (g_path_is_absolute (filename), FALSE);
+  g_return_val_if_fail (filename != NULL, NULL);
+  g_return_val_if_fail (g_path_is_absolute (filename), NULL);
 
   if (!stat_with_error (filename, &wfad, &error))
     {
@@ -1148,7 +1148,7 @@ gtk_file_system_win32_create_folder (GtkFileSystem                    *file_syst
   system_win32 = GTK_FILE_SYSTEM_WIN32 (file_system);
 
   filename = gtk_file_path_get_string (path);
-  g_return_val_if_fail (filename != NULL, FALSE);
+  g_return_val_if_fail (filename != NULL, NULL);
   g_return_val_if_fail (g_path_is_absolute (filename), NULL);
 
   handle = create_handle (file_system);

diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index 6c4723048ea6bc1eb5623bf940bbc3ccbfe07c79..58c4494809d6ac2a8a7c97249d2b04f0f44ff652 100644 (file)
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -842,7 +842,6 @@ gtk_hsv_motion (GtkWidget      *widget,
   GtkHSV *hsv;
   HSVPrivate *priv;
   double x, y;
-  gint ix, iy;
   GdkModifierType mods;
   
   hsv = GTK_HSV (widget);

diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index ced430d665fb8d32cee8115400576fb8657051a8..f738ab0645de35c1821b80242f4484146fffebe4 100644 (file)
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -442,7 +442,7 @@ gtk_link_button_clicked (GtkButton *button)
   GtkLinkButton *link_button = GTK_LINK_BUTTON (button);
 
   if (uri_func)
-    (* uri_func) (button, link_button->priv->uri, uri_func_data);
+    (* uri_func) (link_button, link_button->priv->uri, uri_func_data);
 
   link_button->priv->visited = TRUE;
 

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 0d0bed6b9bbfccf6106122c74e6b4abe4a452f31..30123a23b8e3593c89577c3c1dfb50b9d8172107 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -1295,9 +1295,9 @@ gtk_list_store_row_drop_possible (GtkTreeDragDest  *drag_dest,
 
 /* Reordering */
 static gint
-gtk_list_store_reorder_func (gconstpointer a,
-                            gconstpointer b,
-                            gpointer      user_data)
+gtk_list_store_reorder_func (GSequenceIter *a,
+                            GSequenceIter *b,
+                            gpointer       user_data)
 {
   GHashTable *new_positions = user_data;
   gint apos = GPOINTER_TO_INT (g_hash_table_lookup (new_positions, a));
@@ -1534,8 +1534,8 @@ gtk_list_store_move_after (GtkListStore *store,
     
 /* Sorting */
 static gint
-gtk_list_store_compare_func (gconstpointer a,
-                            gconstpointer b,
+gtk_list_store_compare_func (GSequenceIter *a,
+                            GSequenceIter *b,
                             gpointer      user_data)
 {
   GtkListStore *list_store = user_data;

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index dc8afdf4d298e8d821172f9f69dc7d4e87a23524..17167c47f86053416de4b442aab167e5aa174603 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -1437,7 +1437,7 @@ create_main_page (GtkPrintUnixDialog *dialog)
   GtkPrintUnixDialogPrivate *priv = dialog->priv;
   GtkWidget *main_vbox, *label, *vbox, *hbox;
   GtkWidget *scrolled, *treeview, *frame, *table;
-  GtkWidget *entry, *spinbutton, *event_box;
+  GtkWidget *entry, *spinbutton;
   GtkWidget *radio, *check, *image;
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;

diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index bce5124179af2394ea5a7b6007cb64959c534685..0765f9a2550da5e46b17c3f21c98f4b4c80a7e1f 100755 (executable)
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -699,7 +699,7 @@ gtk_status_icon_get_property (GObject    *object,
       break;
     case PROP_ORIENTATION:
 #ifdef GDK_WINDOWING_X11
-      g_value_set_enum (value, _gtk_tray_icon_get_orientation (status_icon->priv->tray_icon));
+      g_value_set_enum (value, _gtk_tray_icon_get_orientation (GTK_TRAY_ICON (status_icon->priv->tray_icon)));
 #endif
 #ifdef GDK_WINDOWING_WIN32
       g_value_set_enum (value, status_icon->priv->orientation);

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 20a8a9f5144f8b3079210b0d592374d66b96d8b8..4cb62fe4ce441839a0bc6b729f771a909f29d72f 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -2060,7 +2060,7 @@ gtk_text_key_press (GtkWidget   *widget,
                  gtk_text_move_backward_character (text);
                  break;
                case 'c':
-                 gtk_editable_copy_clipboard (text);
+                 gtk_editable_copy_clipboard (GTK_EDITABLE (text));
                  break;
                case 'd':
                  gtk_text_delete_forward_character (text);
@@ -2087,13 +2087,13 @@ gtk_text_key_press (GtkWidget   *widget,
                  gtk_text_delete_line (text);
                  break;
                case 'v':
-                 gtk_editable_paste_clipboard (text);
+                 gtk_editable_paste_clipboard (GTK_EDITABLE (text));
                  break;
                case 'w':
                  gtk_text_delete_backward_word (text);
                  break;
                case 'x':
-                 gtk_editable_cut_clipboard (text);
+                 gtk_editable_cut_clipboard (GTK_EDITABLE (text));
                  break;
                default:
                  return_val = FALSE;

diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
index 826e31963846c0bdd2b32eed43bddca7dfc168e5..baf41235f98afe007c5de5143cf919f4137c5d21 100755 (executable)
--- a/gtk/gtktrayicon-x11.c
+++ b/gtk/gtktrayicon-x11.c
@@ -372,7 +372,6 @@ static void
 gtk_tray_icon_manager_window_destroyed (GtkTrayIcon *icon)
 {
   GtkWidget *widget = GTK_WIDGET (icon);
-  GdkWindow *gdkwin;
 
   g_return_if_fail (GTK_WIDGET_REALIZED (icon));
   g_return_if_fail (icon->priv->manager_window != None);
@@ -391,7 +390,6 @@ gtk_tray_icon_delete (GtkWidget   *widget,
                      GdkEventAny *event)
 {
   GtkTrayIcon *icon = GTK_TRAY_ICON (widget);
-  GdkWindow *gdkwin;
 
   GTK_NOTE (PLUGSOCKET,
            g_print ("GtkStatusIcon %p: delete notify, tray manager window %x\n",

diff --git a/gtk/gtkxembed.c b/gtk/gtkxembed.c
index 2c56b0ba4a6d7684d3abcee9e185d4f8fcc2fcb2..c1feb5725203c31512994b1609ba233b6a108b77 100644 (file)
--- a/gtk/gtkxembed.c
+++ b/gtk/gtkxembed.c
@@ -165,7 +165,7 @@ _gtk_xembed_send_message (GdkWindow        *recipient,
   gdk_error_trap_push ();
   XSendEvent (GDK_WINDOW_XDISPLAY(recipient),
              GDK_WINDOW_XWINDOW (recipient),
-             False, NoEventMask, &xclient);
+             False, NoEventMask, (XEvent *)&xclient);
   gdk_display_sync (display);
   gdk_error_trap_pop ();
 }